Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport of deps: coredns v1.10.1 into release/1.16.x #17934

Merged
merged 1 commit into from
Jun 28, 2023
Merged

Backport of deps: coredns v1.10.1 into release/1.16.x #17934

merged 1 commit into from
Jun 28, 2023

Conversation

hc-github-team-consul-core
Copy link
Contributor

Backport

This PR is auto-generated from #17912 to be assessed for backporting due to the inclusion of the label backport/1.16.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@loshz
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.

Description

Bumps the coredns from v1.6.6-> v1.10.1

Addresses CVEs noted in #17358

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/loshz/bump-coredns/nominally-sunny-filly branch from 8a676b4 to 40aa48b Compare June 28, 2023 14:54
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/loshz/bump-coredns/nominally-sunny-filly branch 2 times, most recently from 380de06 to 40aa48b Compare June 28, 2023 14:54
@github-actions github-actions bot added the pr/dependencies PR specifically updates dependencies of project label Jun 28, 2023
github-team-consul-core-pr-approver
github-team-consul-core-pr-approver approved these changes Jun 28, 2023
View reviewed changes
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@vercel vercel bot temporarily deployed to Preview – consul June 28, 2023 14:58 Inactive
@loshz loshz marked this pull request as ready for review June 28, 2023 16:30
@loshz loshz merged commit 7b53c99 into release/1.16.x Jun 28, 2023
@loshz loshz deleted the backport/loshz/bump-coredns/nominally-sunny-filly branch June 28, 2023 16:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-team-consul-core-pr-approver github-team-consul-core-pr-approver github-team-consul-core-pr-approver approved these changes

@loshz loshz Awaiting requested review from loshz

Assignees

@loshz loshz

Labels
pr/dependencies PR specifically updates dependencies of project
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hc-github-team-consul-core @github-team-consul-core-pr-approver @loshz